From: Jimmy Aguilar Mena <spacibba@aol.com>
Date: Sun, 13 Oct 2019 21:20:22 +0000 (+0200)
Subject: Fix issue calling face_at_pos.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~1466^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7a10082093791f0e035e4f9f95a774a7be1cd586;p=emacs.git

Fix issue calling face_at_pos.

*src/xdisp.c (extend_face_to_end_of_line): Add extra condition when
producing glyphs from a C string to not call face_at_pos.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index d54b717a507..30be492d9b4 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21578,7 +21578,8 @@ extend_face_to_end_of_line (struct it *it)
 	   || WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0))
     return;
 
-  const int extend_face_id = (it->face_id == DEFAULT_FACE_ID)
+  const int extend_face_id = (it->face_id == DEFAULT_FACE_ID
+                              || it->s != NULL)
     ? DEFAULT_FACE_ID
     : face_at_pos (it, LFACE_EXTEND_INDEX);